Merge branch 'wip/jimmac/adjust-for-contemporary-trends' into 'master'

Wip/jimmac/adjust for contemporary trends

Closes #3568 and #3560

See merge request GNOME/gtk!3060

diff --cc gtk/theme/Adwaita/_drawing.scss
index bb42363fe026053457b134b0aa32294af1de229c,d8c775848af653d6f54ddeef1643285f06ae697a..b8fed6ea3f5320453bc26b21e97046bacf4b054a
--- 1/gtk/theme/Adwaita/_drawing.scss
--- 2/gtk/theme/Adwaita/_drawing.scss
+++ b/gtk/theme/Adwaita/_drawing.scss
@@@ -428,12 -348,11 +348,11 @@@ $_default_button_c: lighten($bg_color,2
      border-color: transparent;
      background-image: none;
      box-shadow: none;
-     text-shadow: none;
      @if $variant == 'light' {
 -      background-color: darken($c,30%);
 +      background-color: darken($c,20%);
      }
      @else {
 -      background-color: darken($c,14%);
 +      background-color: darken($c,5%);
      }
    }
  }